Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Cat people have feline screams now and custom emote - #11642

Merged
adamsong merged 5 commits into
masterfrom
Cat-Emotes
Jul 7, 2021
Merged

Cat people have feline screams now and custom emote#11642
adamsong merged 5 commits into
masterfrom
Cat-Emotes

Conversation

@JamieD1

@JamieD1 JamieD1 commented Jun 27, 2021

Copy link
Copy Markdown
Contributor

Intent of your Pull Request

Lizards have hiss so cats now have meow, makes sense :thonk:

Changelog

🆑
rscadd: Felindids now have custom emotes
/:cl:

@JamieD1
JamieD1 requested a review from a team as a code owner June 27, 2021 19:59
@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Sound This PR changes audio files labels Jun 27, 2021
Bibby0110
Bibby0110 reviewed Jun 27, 2021
View reviewed changes
Comment thread .vscode/settings.json
Bibby0110
Bibby0110 reviewed Jun 27, 2021
View reviewed changes
Comment thread code/modules/mob/living/carbon/human/emote.dm Outdated
Bibby0110
Bibby0110 reviewed Jun 27, 2021
View reviewed changes
Comment thread code/modules/mob/living/carbon/human/emote.dm
@Yogbot-13

Yogbot-13 commented Jul 1, 2021

Copy link
Copy Markdown
Contributor

Test Merge Deployed

Server Instance

main

Merged By

JamieD12

Revision

Origin: 6eac6b8
Pull Request: 7e6ff9a
Server: 4cf045dcc80de3751ed501a3fdf71a161b4b6078

@Yogbot-13

Yogbot-13 commented Jul 1, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 09dc773
Pull Request: 7e6ff9a
Server: 8ce5531e4aa90f730f2881ca15125742069cc3b7

Bibby0110
Bibby0110 reviewed Jul 1, 2021
View reviewed changes
Comment thread .vscode/settings.json Outdated
"filenamePattern": "*.dmi",
"viewType": "imagePreview.previewEditor"
}
],

@Bibby0110 Bibby0110 Jul 1, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still undocumented change

@Yogbot-13

Yogbot-13 commented Jul 1, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 50e22d9
Pull Request: 7e6ff9a
Server: cfbef971e39f756f57c6351ccba16176fb7ca9b7

@maxion12345 maxion12345 mentioned this pull request Jul 1, 2021
Closed
@Yogbot-13

Yogbot-13 commented Jul 2, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: d244ed8
Pull Request: 7e6ff9a
Server: c9dd238bda1b13104771876231c7f061360f117a

@Yogbot-13

Yogbot-13 commented Jul 2, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: b34fc83
Pull Request: 7e6ff9a
Server: 99a8136a2c3ea2386b7417cadce313eef7205037

@Yogbot-13

Yogbot-13 commented Jul 2, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 51d15f3
Pull Request: 7e6ff9a
Server: 08a5b01226a862a638855658a1fcb349f2180bdf

@Yogbot-13

Yogbot-13 commented Jul 2, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: faf404b
Pull Request: 7e6ff9a
Server: 261ac2b415670d9615de140a821f0aed25f45412

@adamsong adamsong added the TESTMERGED This PR is currently live in a test merge. label Jul 2, 2021
@Yogbot-13

Yogbot-13 commented Jul 2, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: dfdf9d2
Pull Request: 7e6ff9a
Server: a57b89a5cefc62a3059460567fc50d2b23efa5f5

@Yogbot-13

Yogbot-13 commented Jul 2, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: dfdf9d2
Pull Request: 7e6ff9a
Server: d723368c137b9977e75b3e26dfb321c788297cdd

@Yogbot-13

Yogbot-13 commented Jul 3, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 24d1f23
Pull Request: 7e6ff9a
Server: 1c84e2f8d3d922d24bcc92d7edb9ce9e32d5252e

@Yogbot-13

Yogbot-13 commented Jul 4, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: e581b72
Pull Request: 7e6ff9a
Server: fc7122cf9f35688fd96d1b459cc1c9b61682e752

@Yogbot-13

Yogbot-13 commented Jul 4, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 1befeb3
Pull Request: 7e6ff9a
Server: 87f7ce98fbe6e2119e87704ba716dc7213e89bd9

@Yogbot-13

Yogbot-13 commented Jul 4, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: bfcf8bf
Pull Request: 7e6ff9a
Server: e56275b82d8a1b0a3a432a233629ac206864f83a

@Yogbot-13

Yogbot-13 commented Jul 5, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 074dc71
Pull Request: 7e6ff9a
Server: e10404c9a10c2ee7f917b59885fa18ede7f0435a

@Yogbot-13

Yogbot-13 commented Jul 5, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: aeb34a7
Pull Request: 7e6ff9a
Server: 3fc96da3fe7b326106f45bec9fcd29d2afa4b3c4

@Yogbot-13

Yogbot-13 commented Jul 5, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 5b96721
Pull Request: 7e6ff9a
Server: 0e5c469765b215fb6c9c7efe7e82d2ab360f0212

adamsong
adamsong approved these changes Jul 5, 2021
View reviewed changes

@adamsong adamsong left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is fine, works and intended, good to merge once art reviews it

@Yogbot-13

Yogbot-13 commented Jul 5, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: a2b0d80
Pull Request: 7e6ff9a
Server: 48ff5736e8e42a68fceb7e361203ebf0fa1bbeb2

@Yogbot-13

Yogbot-13 commented Jul 5, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: 75e2418
Pull Request: 7e6ff9a
Server: a573d4fda4232a30130441438b8607ed178df93e

@Yogbot-13

Yogbot-13 commented Jul 5, 2021

Copy link
Copy Markdown
Contributor

Test Merge Updated

Server Instance

main

Merged By

JamieD12

Revision

Origin: b0848ca
Pull Request: 7e6ff9a
Server: 46c827dc9eeae1ddda6382961b987de97833563a

@adamsong
adamsong merged commit 2fb9dc7 into master Jul 7, 2021
@adamsong
adamsong deleted the Cat-Emotes branch July 7, 2021 11:05
Yogbot-13 added a commit that referenced this pull request Jul 7, 2021
@Yogbot-13
Automatic changelog generation #11642 [ci skip]
5325742
Bibby0110 added a commit to Bibby0110/Yogstationa that referenced this pull request Jul 8, 2021
@Bibby0110
Revert "Cat people have feline screams now and custom emote (yogstati…
25ab79a 
…on13#11642)"

This reverts commit 2fb9dc7.
alexkar598 pushed a commit that referenced this pull request Jul 8, 2021
@Bibby0110
Revert "Cat people have feline screams now and custom emote (#11642)" (…
4f1dc4b 
…#11736)

This reverts commit 2fb9dc7.
Bibby0110 added a commit to Bibby0110/Yogstationa that referenced this pull request Jul 8, 2021
@Bibby0110
Revert "Revert "Cat people have feline screams now and custom emote (y…
d6679d7 
…ogstation13#11642)" (yogstation13#11736)"

This reverts commit 4f1dc4b.
@Absolucy Absolucy mentioned this pull request Jan 1, 2024
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers
@Bibby0110 Bibby0110 Bibby0110 left review comments
@adamsong adamsong adamsong approved these changes
@nesisknesis nesisknesis nesisknesis approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Feature This adds new content to the game Sound This PR changes audio files TESTMERGED This PR is currently live in a test merge.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@JamieD1 @Yogbot-13 @adamsong @Bibby0110 @nesisknesis